Merge from trunk
authorJason Rumney <jasonr@gnu.org>
Mon, 11 Jan 2010 14:34:47 +0000 (22:34 +0800)
committerJason Rumney <jasonr@gnu.org>
Mon, 11 Jan 2010 14:34:47 +0000 (22:34 +0800)
commit2f0dd9d47a589ef5e7325da26188e1e60ecc3c1c
tree58b3eadcd89c49025bbb63cfa75e86711294a902
parentff9549aa572e254e7d2cb70960da6aa91b14d2bb
parentcc6f1b2c80f34791bc7d15eba193ff3b746a8ee9
Merge from trunk